+Wed Nov 23 18:55:47 2005 Tim Janik <timj@imendio.com>
+
+ * gtk/gtkobject.[hc]: deprecated floating/sink API and implemented it
+ in terms of the GObject floating/sink API.
+
+ * gtk/gtkaboutdialog.c:
+ * gtk/gtkaction.c:
+ * gtk/gtkcellview.c:
+ * gtk/gtkclist.c:
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkcombobox.c:
+ * gtk/gtkfilechooserdefault.c:
+ * gtk/gtkiconview.c:
+ * gtk/gtkinvisible.c:
+ * gtk/gtkitemfactory.c:
+ * gtk/gtklayout.c:
+ * gtk/gtkmenu.c:
+ * gtk/gtkmenutoolbutton.c:
+ * gtk/gtknotebook.c:
+ * gtk/gtkprogress.c:
+ * gtk/gtkrange.c:
+ * gtk/gtkspinbutton.c:
+ * gtk/gtkstatusicon.c:
+ * gtk/gtktext.c:
+ * gtk/gtktextview.c:
+ * gtk/gtktoolbar.c:
+ * gtk/gtktoolbutton.c:
+ * gtk/gtktoolitem.c:
+ * gtk/gtktreeitem.c:
+ * gtk/gtktreeview.c:
+ * gtk/gtktreeviewcolumn.c:
+ * gtk/gtkuimanager.c:
+ * gtk/gtkviewport.c:
+ * gtk/gtkwidget.c:
+ * gtk/gtkwindow.c:
+ ported to use GObject's g_object_ref_sink().
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilechooserdefault.c:
+ * gtk/gtkaboutdialog.c:
+ fixed compiler warnings.
+
2005-11-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksettings.c (gtk_settings_class_init): Add some docs
+Wed Nov 23 18:55:47 2005 Tim Janik <timj@imendio.com>
+
+ * gtk/gtkobject.[hc]: deprecated floating/sink API and implemented it
+ in terms of the GObject floating/sink API.
+
+ * gtk/gtkaboutdialog.c:
+ * gtk/gtkaction.c:
+ * gtk/gtkcellview.c:
+ * gtk/gtkclist.c:
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkcombobox.c:
+ * gtk/gtkfilechooserdefault.c:
+ * gtk/gtkiconview.c:
+ * gtk/gtkinvisible.c:
+ * gtk/gtkitemfactory.c:
+ * gtk/gtklayout.c:
+ * gtk/gtkmenu.c:
+ * gtk/gtkmenutoolbutton.c:
+ * gtk/gtknotebook.c:
+ * gtk/gtkprogress.c:
+ * gtk/gtkrange.c:
+ * gtk/gtkspinbutton.c:
+ * gtk/gtkstatusicon.c:
+ * gtk/gtktext.c:
+ * gtk/gtktextview.c:
+ * gtk/gtktoolbar.c:
+ * gtk/gtktoolbutton.c:
+ * gtk/gtktoolitem.c:
+ * gtk/gtktreeitem.c:
+ * gtk/gtktreeview.c:
+ * gtk/gtktreeviewcolumn.c:
+ * gtk/gtkuimanager.c:
+ * gtk/gtkviewport.c:
+ * gtk/gtkwidget.c:
+ * gtk/gtkwindow.c:
+ ported to use GObject's g_object_ref_sink().
+
+ * gtk/gtkcolorsel.c:
+ * gtk/gtkfilechooserdefault.c:
+ * gtk/gtkaboutdialog.c:
+ fixed compiler warnings.
+
2005-11-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksettings.c (gtk_settings_class_init): Add some docs
gtk_object_set_data_by_id_full
gtk_object_set_data_full
gtk_object_set_user_data
+gtk_object_sink
#endif
gtk_object_destroy
gtk_object_get_type G_GNUC_CONST
-gtk_object_sink
#endif
#endif
{
GtkTextIter end;
gchar *link;
- gchar *link_type;
+ const gchar *link_type;
GtkTextTag *tag;
gtk_text_buffer_insert_at_cursor (buffer, q0, q1 - q0);
{
dialog = gtk_about_dialog_new ();
- g_object_ref (dialog);
- gtk_object_sink (GTK_OBJECT (dialog));
+ g_object_ref_sink (dialog);
g_signal_connect (dialog, "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
{
menu_item = gtk_action_create_menu_item (action);
- g_object_ref (menu_item);
- gtk_object_sink (GTK_OBJECT (menu_item));
+ g_object_ref_sink (menu_item);
gtk_tool_item_set_proxy_menu_item (tool_item,
"gtk-action-menu-item", menu_item);
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer));
- g_object_ref (renderer);
- gtk_object_sink (GTK_OBJECT (renderer));
+ g_object_ref_sink (renderer);
info = g_new0 (GtkCellViewCellInfo, 1);
info->cell = renderer;
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer));
- g_object_ref (renderer);
- gtk_object_sink (GTK_OBJECT (renderer));
+ g_object_ref_sink (renderer);
info = g_new0 (GtkCellViewCellInfo, 1);
info->cell = renderer;
if (clist->hadjustment)
{
- gtk_object_ref (GTK_OBJECT (clist->hadjustment));
- gtk_object_sink (GTK_OBJECT (clist->hadjustment));
+ g_object_ref_sink (clist->hadjustment);
gtk_signal_connect (GTK_OBJECT (clist->hadjustment), "changed",
(GtkSignalFunc) hadjustment_changed,
if (clist->vadjustment)
{
- gtk_object_ref (GTK_OBJECT (clist->vadjustment));
- gtk_object_sink (GTK_OBJECT (clist->vadjustment));
+ g_object_ref_sink (clist->vadjustment);
gtk_signal_connect (GTK_OBJECT (clist->vadjustment), "changed",
(GtkSignalFunc) vadjustment_changed,
GdkEventButton *event,
gpointer data)
{
- GtkColorSelection *colorsel = data;
+ /* GtkColorSelection *colorsel = data; */
if (event->button != 1)
return FALSE;
GdkEventButton *event,
gpointer data)
{
- GtkColorSelection *colorsel = data;
+ /* GtkColorSelection *colorsel = data; */
if (event->type == GDK_BUTTON_PRESS &&
event->button == 1)
priv->default_alpha_set = FALSE;
priv->tooltips = gtk_tooltips_new ();
- g_object_ref (priv->tooltips);
- gtk_object_sink (GTK_OBJECT (priv->tooltips));
+ g_object_ref_sink (priv->tooltips);
gtk_box_set_spacing (GTK_BOX (colorsel), 4);
top_hbox = gtk_hbox_new (FALSE, 8);
/* the column is needed in tree_column_row_is_sensitive() */
combo_box->priv->column = gtk_tree_view_column_new ();
- g_object_ref (combo_box->priv->column);
- gtk_object_sink (GTK_OBJECT (combo_box->priv->column));
+ g_object_ref_sink (combo_box->priv->column);
gtk_combo_box_sync_cells (combo_box,
GTK_CELL_LAYOUT (combo_box->priv->column));
combo_box = GTK_COMBO_BOX (layout);
- g_object_ref (cell);
- gtk_object_sink (GTK_OBJECT (cell));
+ g_object_ref_sink (cell);
info = g_new0 (ComboCellInfo, 1);
info->cell = cell;
combo_box = GTK_COMBO_BOX (layout);
- g_object_ref (cell);
- gtk_object_sink (GTK_OBJECT (cell));
+ g_object_ref_sink (cell);
info = g_new0 (ComboCellInfo, 1);
info->cell = cell;
gtk_box_set_spacing (GTK_BOX (impl), 12);
impl->tooltips = gtk_tooltips_new ();
- g_object_ref (impl->tooltips);
- gtk_object_sink (GTK_OBJECT (impl->tooltips));
+ g_object_ref_sink (impl->tooltips);
profile_end ("end", NULL);
}
return;
}
- g_object_ref (filter);
- gtk_object_sink (GTK_OBJECT (filter));
+ g_object_ref_sink (filter);
impl->filters = g_slist_append (impl->filters, filter);
name = gtk_file_filter_get_name (filter);
impl->current_filter = filter;
if (impl->current_filter)
{
- g_object_ref (impl->current_filter);
- gtk_object_sink (GTK_OBJECT (filter));
+ g_object_ref_sink (impl->current_filter);
}
if (impl->filters)
*/
if (child_path != NULL)
{
- gtk_file_chooser_default_select_path (impl, child_path, NULL);
+ gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (impl), child_path, NULL);
browse_files_center_selected_row (impl);
}
}
{
GtkFileChooserDefault *impl;
const GtkFileInfo *info;
- GtkFileTime time_mtime, time_now;
+ GtkFileTime time_mtime;
GDate mtime, now;
int days_diff;
char buf[256];
strcpy (buf, _("Unknown"));
else
{
- g_date_set_time (&mtime, (GTime) time_mtime);
-
- time_now = (GTime ) time (NULL);
- g_date_set_time (&now, (GTime) time_now);
+ time_t time_now;
+ g_date_set_time_t (&mtime, time_mtime);
+ time_now = time (NULL);
+ g_date_set_time_t (&now, time_now);
days_diff = g_date_get_julian (&now) - g_date_get_julian (&mtime);
if (icon_view->priv->hadjustment != hadj)
{
icon_view->priv->hadjustment = hadj;
- g_object_ref (icon_view->priv->hadjustment);
- gtk_object_sink (GTK_OBJECT (icon_view->priv->hadjustment));
+ g_object_ref_sink (icon_view->priv->hadjustment);
g_signal_connect (icon_view->priv->hadjustment, "value_changed",
G_CALLBACK (gtk_icon_view_adjustment_changed),
if (icon_view->priv->vadjustment != vadj)
{
icon_view->priv->vadjustment = vadj;
- g_object_ref (icon_view->priv->vadjustment);
- gtk_object_sink (GTK_OBJECT (icon_view->priv->vadjustment));
+ g_object_ref_sink (icon_view->priv->vadjustment);
g_signal_connect (icon_view->priv->vadjustment, "value_changed",
G_CALLBACK (gtk_icon_view_adjustment_changed),
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (!gtk_icon_view_get_cell_info (icon_view, renderer));
- g_object_ref (renderer);
- gtk_object_sink (GTK_OBJECT (renderer));
+ g_object_ref_sink (renderer);
info = g_new0 (GtkIconViewCellInfo, 1);
info->cell = renderer;
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (!gtk_icon_view_get_cell_info (icon_view, renderer));
- g_object_ref (renderer);
- gtk_object_sink (GTK_OBJECT (renderer));
+ g_object_ref_sink (renderer);
info = g_new0 (GtkIconViewCellInfo, 1);
info->cell = renderer;
GTK_WIDGET_UNSET_FLAGS (invisible, GTK_NO_WINDOW);
GTK_WIDGET_SET_FLAGS (invisible, GTK_TOPLEVEL);
- g_object_ref (invisible);
- gtk_object_sink (GTK_OBJECT (invisible));
+ g_object_ref_sink (invisible);
invisible->has_user_ref_count = TRUE;
invisible->screen = gdk_screen_get_default ();
ifactory->widget = g_object_connect (gtk_widget_new (container_type, NULL),
"signal::destroy", gtk_widget_destroyed, &ifactory->widget,
NULL);
- g_object_ref (ifactory);
- gtk_object_sink (GTK_OBJECT (ifactory));
+ g_object_ref_sink (ifactory);
gtk_item_factory_add_item (ifactory,
"", NULL,
dobj = GTK_OBJECT (ifactory->widget);
- g_object_ref (dobj);
- gtk_object_sink (dobj);
+ g_object_ref_sink (dobj);
gtk_object_destroy (dobj);
g_object_unref (dobj);
if (layout->hadjustment != hadj)
{
layout->hadjustment = hadj;
- g_object_ref (layout->hadjustment);
- gtk_object_sink (GTK_OBJECT (layout->hadjustment));
+ g_object_ref_sink (layout->hadjustment);
gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width, FALSE);
g_signal_connect (layout->hadjustment, "value_changed",
if (layout->vadjustment != vadj)
{
layout->vadjustment = vadj;
- g_object_ref (layout->vadjustment);
- gtk_object_sink (GTK_OBJECT (layout->vadjustment));
+ g_object_ref_sink (layout->vadjustment);
gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height, FALSE);
g_signal_connect (layout->vadjustment, "value_changed",
/* Refloat the menu, so that reference counting for the menu isn't
* affected by it being a child of the toplevel
*/
- GTK_WIDGET_SET_FLAGS (menu, GTK_FLOATING);
+ g_object_force_floating (G_OBJECT (menu));
menu->needs_destruction_ref_count = TRUE;
menu->view_window = NULL;
return;
}
- g_object_ref (menu);
- gtk_object_sink (GTK_OBJECT (menu));
+ g_object_ref_sink (menu);
data = g_new (GtkMenuAttachData, 1);
data->attach_widget = attach_widget;
{
GtkObject *object = GTK_OBJECT (menu);
GtkWidget *widget = GTK_WIDGET (menu);
- gboolean was_floating = GTK_OBJECT_FLOATING (object);
+ gboolean was_floating = g_object_is_floating (object);
- g_object_ref (object);
- gtk_object_sink (object);
+ g_object_ref_sink (object);
if (unrealize)
{
gtk_widget_reparent (GTK_WIDGET (menu), new_parent);
if (was_floating)
- GTK_OBJECT_SET_FLAGS (object, GTK_FLOATING);
+ g_object_force_floating (G_OBJECT (object));
else
g_object_unref (object);
}
if (priv->menu)
{
- g_object_ref (priv->menu);
- gtk_object_sink (GTK_OBJECT (priv->menu));
+ g_object_ref_sink (priv->menu);
gtk_widget_set_sensitive (priv->arrow_button, TRUE);
page->default_menu = TRUE;
else
{
- g_object_ref (page->menu_label);
- gtk_object_sink (GTK_OBJECT (page->menu_label));
+ g_object_ref_sink (page->menu_label);
}
if (notebook->menu)
if (menu_label)
{
page->menu_label = menu_label;
- g_object_ref (page->menu_label);
- gtk_object_sink (GTK_OBJECT(page->menu_label));
+ g_object_ref_sink (page->menu_label);
page->default_menu = FALSE;
}
else
gtk_object_init (GtkObject *object,
GtkObjectClass *klass)
{
- GTK_OBJECT_FLAGS (object) = GTK_FLOATING;
}
/********************************************
{
GtkObject *object = GTK_OBJECT (gobject);
- if (GTK_OBJECT_FLOATING (object))
+ if (g_object_is_floating (object))
{
g_warning ("A floating object was finalized. This means that someone\n"
"called g_object_unref() on an object that had only a floating\n"
"reference; the initial floating reference is not owned by anyone\n"
- "and must be removed with gtk_object_sink() after a normal\n"
- "reference is obtained with g_object_ref().");
+ "and must be removed with g_object_ref_sink().");
}
gtk_object_notify_weaks (object);
}
}
-/*****************************************
- * gtk_object_sink:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
void
gtk_object_sink (GtkObject *object)
{
g_return_if_fail (GTK_IS_OBJECT (object));
-
- if (GTK_OBJECT_FLOATING (object))
- {
- GTK_OBJECT_UNSET_FLAGS (object, GTK_FLOATING);
- g_object_unref (object);
- }
+ g_object_ref_sink (object);
+ g_object_unref (object);
}
/*****************************************
typedef enum
{
GTK_IN_DESTRUCTION = 1 << 0, /* Used internally during dispose */
+#ifndef GTK_DISABLE_DEPRECATED
GTK_FLOATING = 1 << 1,
+#endif
GTK_RESERVED_1 = 1 << 2,
GTK_RESERVED_2 = 1 << 3
} GtkObjectFlags;
/* Macros for extracting the object_flags from GtkObject.
*/
#define GTK_OBJECT_FLAGS(obj) (GTK_OBJECT (obj)->flags)
+#ifndef GTK_DISABLE_DEPRECATED
#define GTK_OBJECT_FLOATING(obj) ((GTK_OBJECT_FLAGS (obj) & GTK_FLOATING) != 0)
+#endif
/* Macros for setting and clearing bits in the object_flags field of GtkObject.
*/
GtkType gtk_object_get_type (void) G_GNUC_CONST;
+#ifndef GTK_DISABLE_DEPRECATED
void gtk_object_sink (GtkObject *object);
+#endif
void gtk_object_destroy (GtkObject *object);
/****************************************************************/
progress->adjustment = adjustment;
if (adjustment)
{
- g_object_ref (adjustment);
- gtk_object_sink (GTK_OBJECT (adjustment));
+ g_object_ref_sink (adjustment);
g_signal_connect (adjustment, "changed",
G_CALLBACK (gtk_progress_changed),
progress);
}
range->adjustment = adjustment;
- g_object_ref (adjustment);
- gtk_object_sink (GTK_OBJECT (adjustment));
+ g_object_ref_sink (adjustment);
g_signal_connect (adjustment, "changed",
G_CALLBACK (gtk_range_adjustment_changed),
spin_button->adjustment = adjustment;
if (adjustment)
{
- g_object_ref (adjustment);
- gtk_object_sink (GTK_OBJECT (adjustment));
+ g_object_ref_sink (adjustment);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (gtk_spin_button_value_changed),
spin_button);
gtk_widget_show (status_icon->priv->tray_icon);
status_icon->priv->tooltips = gtk_tooltips_new ();
- g_object_ref (status_icon->priv->tooltips);
- gtk_object_sink (GTK_OBJECT (status_icon->priv->tooltips));
+ g_object_ref_sink (status_icon->priv->tooltips);
#endif
#ifdef GDK_WINDOWING_WIN32
if (text->hadj != hadj)
{
text->hadj = hadj;
- gtk_object_ref (GTK_OBJECT (text->hadj));
- gtk_object_sink (GTK_OBJECT (text->hadj));
+ g_object_ref_sink (text->hadj);
gtk_signal_connect (GTK_OBJECT (text->hadj), "changed",
(GtkSignalFunc) gtk_text_adjustment,
if (text->vadj != vadj)
{
text->vadj = vadj;
- gtk_object_ref (GTK_OBJECT (text->vadj));
- gtk_object_sink (GTK_OBJECT (text->vadj));
+ g_object_ref_sink (text->vadj);
gtk_signal_connect (GTK_OBJECT (text->vadj), "changed",
(GtkSignalFunc) gtk_text_adjustment,
if (text_view->hadjustment != hadj)
{
text_view->hadjustment = hadj;
- g_object_ref (text_view->hadjustment);
- gtk_object_sink (GTK_OBJECT (text_view->hadjustment));
+ g_object_ref_sink (text_view->hadjustment);
g_signal_connect (text_view->hadjustment, "value_changed",
G_CALLBACK (gtk_text_view_value_changed),
if (text_view->vadjustment != vadj)
{
text_view->vadjustment = vadj;
- g_object_ref (text_view->vadjustment);
- gtk_object_sink (GTK_OBJECT (text_view->vadjustment));
+ g_object_ref_sink (text_view->vadjustment);
g_signal_connect (text_view->vadjustment, "value_changed",
G_CALLBACK (gtk_text_view_value_changed),
toolbar->style = DEFAULT_TOOLBAR_STYLE;
toolbar->icon_size = DEFAULT_ICON_SIZE;
toolbar->tooltips = gtk_tooltips_new ();
- g_object_ref (toolbar->tooltips);
- gtk_object_sink (GTK_OBJECT (toolbar->tooltips));
+ g_object_ref_sink (toolbar->tooltips);
priv->arrow_button = gtk_toggle_button_new ();
g_signal_connect (priv->arrow_button, "button_press_event",
if (priv->highlight_tool_item)
g_object_unref (priv->highlight_tool_item);
- g_object_ref (tool_item);
- gtk_object_sink (GTK_OBJECT (tool_item));
+ g_object_ref_sink (tool_item);
priv->highlight_tool_item = tool_item;
if (icon_widget)
{
- g_object_ref (icon_widget);
- gtk_object_sink (GTK_OBJECT (icon_widget));
+ g_object_ref_sink (icon_widget);
}
button->priv->icon_widget = icon_widget;
if (label_widget)
{
- g_object_ref (label_widget);
- gtk_object_sink (GTK_OBJECT (label_widget));
+ g_object_ref_sink (label_widget);
}
button->priv->label_widget = label_widget;
if (menu_item)
{
- g_object_ref (menu_item);
- gtk_object_sink (GTK_OBJECT (menu_item));
+ g_object_ref_sink (menu_item);
gtk_widget_set_sensitive (menu_item,
GTK_WIDGET_SENSITIVE (tool_item));
gtk_container_add (GTK_CONTAINER (eventbox), pixmapwid);
gtk_widget_show (pixmapwid);
tree_item->plus_pix_widget = pixmapwid;
- gtk_widget_ref (tree_item->plus_pix_widget);
- gtk_object_sink (GTK_OBJECT (tree_item->plus_pix_widget));
+ g_object_ref_sink (tree_item->plus_pix_widget);
/* create pixmap for button '-' */
pixmapwid = gtk_type_new (gtk_pixmap_get_type ());
gtk_container_add (GTK_CONTAINER (eventbox), pixmapwid);
gtk_widget_show (pixmapwid);
tree_item->minus_pix_widget = pixmapwid;
- gtk_widget_ref (tree_item->minus_pix_widget);
- gtk_object_sink (GTK_OBJECT (tree_item->minus_pix_widget));
+ g_object_ref_sink (tree_item->minus_pix_widget);
gtk_widget_set_parent (eventbox, GTK_WIDGET (tree_item));
}
if (tree_view->priv->hadjustment != hadj)
{
tree_view->priv->hadjustment = hadj;
- g_object_ref (tree_view->priv->hadjustment);
- gtk_object_sink (GTK_OBJECT (tree_view->priv->hadjustment));
+ g_object_ref_sink (tree_view->priv->hadjustment);
g_signal_connect (tree_view->priv->hadjustment, "value_changed",
G_CALLBACK (gtk_tree_view_adjustment_changed),
if (tree_view->priv->vadjustment != vadj)
{
tree_view->priv->vadjustment = vadj;
- g_object_ref (tree_view->priv->vadjustment);
- gtk_object_sink (GTK_OBJECT (tree_view->priv->vadjustment));
+ g_object_ref_sink (tree_view->priv->vadjustment);
g_signal_connect (tree_view->priv->vadjustment, "value_changed",
G_CALLBACK (gtk_tree_view_adjustment_changed),
g_return_val_if_fail (gtk_tree_view_column_get_sizing (column)
== GTK_TREE_VIEW_COLUMN_FIXED, -1);
- g_object_ref (column);
- gtk_object_sink (GTK_OBJECT (column));
+ g_object_ref_sink (column);
if (tree_view->priv->n_columns == 0 &&
GTK_WIDGET_REALIZED (tree_view) &&
column = GTK_TREE_VIEW_COLUMN (cell_layout);
g_return_if_fail (! gtk_tree_view_column_get_cell_info (column, cell));
- g_object_ref (cell);
- gtk_object_sink (GTK_OBJECT (cell));
+ g_object_ref_sink (cell);
cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
cell_info->cell = cell;
column = GTK_TREE_VIEW_COLUMN (cell_layout);
g_return_if_fail (! gtk_tree_view_column_get_cell_info (column, cell));
- g_object_ref (cell);
- gtk_object_sink (GTK_OBJECT (cell));
+ g_object_ref_sink (cell);
cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
cell_info->cell = cell;
g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
if (widget)
- {
- g_object_ref (widget);
- gtk_object_sink (GTK_OBJECT (widget));
- }
+ g_object_ref_sink (widget);
if (tree_column->child)
g_object_unref (tree_column->child);
if (info->proxy == NULL)
{
info->proxy = gtk_menu_bar_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_name (info->proxy, info->name);
gtk_widget_show (info->proxy);
g_signal_emit (self, ui_manager_signals[ADD_WIDGET], 0, info->proxy);
if (info->proxy == NULL)
{
info->proxy = gtk_menu_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
}
gtk_widget_set_name (info->proxy, info->name);
break;
if (NODE_INFO (node->parent)->type == NODE_TYPE_TOOLITEM)
{
info->proxy = menu;
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (NODE_INFO (node->parent)->proxy),
menu);
}
else
{
info->proxy = gtk_action_create_menu_item (action);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
g_signal_connect (info->proxy, "notify::visible",
G_CALLBACK (update_smart_separators), NULL);
gtk_widget_set_name (info->proxy, info->name);
if (info->proxy == NULL)
{
info->proxy = gtk_toolbar_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_name (info->proxy, info->name);
gtk_widget_show (info->proxy);
g_signal_emit (self, ui_manager_signals[ADD_WIDGET], 0, info->proxy);
if (find_menu_position (node, &menushell, &pos))
{
info->proxy = gtk_separator_menu_item_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
g_object_set_data (G_OBJECT (info->proxy),
I_("gtk-separator-mode"),
GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
NODE_INFO (node)->proxy, pos);
info->extra = gtk_separator_menu_item_new ();
- g_object_ref (info->extra);
- gtk_object_sink (GTK_OBJECT (info->extra));
+ g_object_ref_sink (info->extra);
g_object_set_data (G_OBJECT (info->extra),
I_("gtk-separator-mode"),
GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
item = gtk_separator_tool_item_new ();
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, pos);
info->proxy = GTK_WIDGET (item);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
g_object_set_data (G_OBJECT (info->proxy),
I_("gtk-separator-mode"),
GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
item = gtk_separator_tool_item_new ();
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, pos+1);
info->extra = GTK_WIDGET (item);
- g_object_ref (info->extra);
- gtk_object_sink (GTK_OBJECT (info->extra));
+ g_object_ref_sink (info->extra);
g_object_set_data (G_OBJECT (info->extra),
I_("gtk-separator-mode"),
GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
if (find_menu_position (node, &menushell, &pos))
{
info->proxy = gtk_action_create_menu_item (action);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_name (info->proxy, info->name);
gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
if (find_toolbar_position (node, &toolbar, &pos))
{
info->proxy = gtk_action_create_tool_item (action);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_name (info->proxy, info->name);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
GtkToolItem *item = gtk_separator_tool_item_new ();
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, pos);
info->proxy = GTK_WIDGET (item);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_no_show_all (info->proxy, TRUE);
if (info->expand)
{
if (find_menu_position (node, &menushell, &pos))
{
info->proxy = gtk_separator_menu_item_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_no_show_all (info->proxy, TRUE);
g_object_set_data (G_OBJECT (info->proxy),
I_("gtk-separator-mode"),
if (*adjustmentp)
g_object_unref (*adjustmentp);
*adjustmentp = adjustment;
- g_object_ref (adjustment);
- gtk_object_sink (GTK_OBJECT (adjustment));
+ g_object_ref_sink (adjustment);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
viewport_set_hadjustment_values (viewport, &value_changed);
/* keep this function in sync with gtk_menu_attach_to_widget()
*/
- g_object_ref (widget);
- gtk_object_sink (GTK_OBJECT (widget));
+ g_object_ref_sink (widget);
widget->parent = parent;
if (GTK_WIDGET_STATE (parent) != GTK_STATE_NORMAL)
return;
}
- g_param_spec_ref (pspec);
- g_param_spec_sink (pspec);
+ g_param_spec_ref_sink (pspec);
g_param_spec_set_qdata (pspec, quark_property_parser, (gpointer) parser);
g_param_spec_pool_insert (style_property_spec_pool, pspec, G_OBJECT_CLASS_TYPE (klass));
}
if (colormap)
gtk_widget_set_colormap (GTK_WIDGET (window), colormap);
- g_object_ref (window);
- gtk_object_sink (GTK_OBJECT (window));
+ g_object_ref_sink (window);
window->has_user_ref_count = TRUE;
toplevel_list = g_slist_prepend (toplevel_list, window);
projects / gtk4.git / commitdiff